Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 14 Dec 2005 12:04:40 +0000 (12:04 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 14 Dec 2005 12:04:40 +0000 (12:04 +0000)

Trivial merge